Resolve CVS conflicts

diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index ef9bb5fc08c7794010bad1e724f724c3874ac805..e23788785ba141cb7f0987c701f13866f2d66df0 100644 (file)
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -1,4 +1,3 @@
-
 ;;; x-dnd.el --- drag and drop support for X.
 
 ;; Copyright (C) 2004
@@ -601,5 +600,4 @@ FORMAT is 32 (not used).  MESSAGE is the data part of an XClientMessageEvent."
 
 (provide 'x-dnd)
 
-;;; arch-tag: ???
 ;;; x-dnd.el ends here